Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 21 Jun 2011 14:45:53 +0000 (07:45 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 21 Jun 2011 14:45:53 +0000 (07:45 -0700)

Trivial merge